Merge "Merge in some android customizations. Minor cleanup. am: dcb310be am:...
Merge "Merge in some android customizations. Minor cleanup. am: dcb310be am: bb6b51fd am: 54976f10" into oc-mr1-dev-plus-aosp
am: 470394b2
Change-Id: I5b2c05f3d451b276b9a97db059722c5d04ee27da