Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: bf161cb24b am: 0bcb614129

Change-Id: Idce0e974124b295b1403ff438c2a542ca2882a77