Merge "Merge "Merge "Cherry-pick 7ad1110e" am:...

Merge "Merge "Merge "Cherry-pick 7ad1110e" am: 6fd06712  -s ours" into stage-aosp-master am: a998cffb  -s ours" into oc-dev-plus-aosp am: 530a622f  -s ours
am: 9f27717e  -s ours

Change-Id: Ice0e0dee03141da42d0dfb673fa0277ae0858a7c