Merge "Merge "Cherry-pick 7ad1110e" am: 6fd06712 -s ours" into stage-aosp-master am: a998cffb -s ours Change-Id: I15f2cf810bd0f2feb3117dbebe7f15daff281c1f