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

Change-Id: Idea34a03099fba87816f048b70f659031c0f2444