Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 0b20a8a314 am: 02f2a08ab2

Change-Id: I789a0c904c81ee9d616e89192e4e61ef360ae65a