Merge "Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265  -s ours" into stage-aosp-master am: a998cffb1b  -s ours" into oc-dev-plus-aosp am: 530a622f60  -s ours
am: 9f27717e72  -s ours

Change-Id: I59c3cf6c0b17537bf9c160f88f1996eddbb80ac4