Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 8c5a46cb6e

Change-Id: Ic3cb8566f5431b8629744ff12534a41af4d1b51d