Merge commit 'ac5d7e74caad0c58eb781265d3924c8b406f6b1c' from
oc-mr1-dev-plus-aosp into stage-aosp-master

Change-Id: I30866e08761de3375fbf589aeb84a5142838242c
tree: a8feace21caa1f5e849d4b3734f21bd60ac2fba6
  1. android/