Merge stage-aosp-master to aosp-master - DO NOT MERGE am: cd3459f07b am: f581c5cbad

Change-Id: I743b6756710aae718fa7dd1892545e7452f1ceea