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

Change-Id: I82c739f82dde402c05e4d6eb4df210bde3f1c5c1