Merge stage-aosp-master to aosp-master - DO NOT MERGE

Change-Id: I4d00ccb3c7d4456fec82773d8b6b3b2cf00dc8f3