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

Change-Id: I979c08656642520bc2256af3d5a6a4e2f916672d