Merge "Merge in some android customizations. Minor cleanup. am: dcb310be2a am: bb6b51fdff am: 54976f107c" into oc-mr1-dev-plus-aosp