Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 4edad3bb73 am: 27a9adae5b

Change-Id: I6d063132491b8a033849f2a3d1ae48ef36900521