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

Change-Id: I87e25dc50f1b4e9115cb94b258cfb18c0e64b032