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

Change-Id: I15b3b1fa2853ed00409c998e853d62956b2628e2