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

Change-Id: I938a855277c3f61e4f6d09f54f7422fe2a145cef