Merge "Merge in some android customizations. Minor cleanup. am: dcb310be am:...
Merge "Merge in some android customizations. Minor cleanup. am: dcb310be am: fb0ab1f5 am: f686a8c4" into oc-mr1-dev-plus-aosp
am: 95678586
Change-Id: Ic1971321b1185e7371345ca0cef28a8da709a400