Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 22828a210c

Change-Id: Ib08f619ae327eea35d4999dc87d37eeb17257ff7