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

Change-Id: I9d95b05d452a6d29dfec014a1d272db3beddeae6