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

Change-Id: I7dca33f0d5a7e46bcef09c1b39621287acee76e9