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

Change-Id: Iccf6d66f2aaa056191b9a8a59b3f162942b5f1a5