Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 189515d523 am: 55c6cf2f3b

Change-Id: Id3f55c1378692719cecef8e4a887249d5800771f