Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 7b40ccbfdf am: ec24d8ece3

Change-Id: I70c0725555a6749cda2dfd36720c378fd2267135