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

Change-Id: Ib42faf5cb6c015927434dcaf3367882a859c46f2