Merge "Merge commit '999a6d00' into manual_merge_999a6d00244c am: 86a70456 am: 46a72044" into oc-dev-plus-aosp