Merge "[automerger skipped] Merge changes into stage-aosp-master am: 25cdce89 -s ours am: 12f59370 -s ours"