Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 24702c49bd

Change-Id: I1287657a8a082c235aa1cf6b9e735ffae186b16f