Merge stage-aosp-master to aosp-master - DO NOT MERGE am: a54deb34ff

Change-Id: I35b0a02afe9c811fc8c64459f4a0b7039665b939