Merge "Merge stage-aosp-master into master." am: d6d7055c30
am: 043c38f3ee

Change-Id: Ie5089e0fcd1328349ca4793d40f92524d7e01212