Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 02a1b39c93 am: 3cadf44aed

Change-Id: I77073a318c80b4be9c764de2928afc8051a36fa2