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

Change-Id: Ic399fc41d82cd174cebb72a6675bc53403836ba6