Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 83fce3a3c6 am: 3f24674199

Change-Id: If46235c37e76329edadb6266286334d0fddcc59f