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

Change-Id: Ibe0a4357e379f647c08d2a9676ce0888db9ede2f