Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 3979022626
am: cb543ebdf7

Change-Id: I3cffb39ef69c4ff14f4d472e5d6c1141ef9216c9