Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 4642e27b37 am: 76195e328f

Change-Id: I8894c88053e539abf8de35975a83e09bd93de8d3