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

Change-Id: I77fa4bb297d728c3ce845f5d0921f0225df49f8d