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

Change-Id: I84fd4bd9a5bc186b020096d18b0d0de4b529c4c0