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

Change-Id: I14842abc0bd9265acdd2776ef8d599628cb7ee04