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

Change-Id: Ic5eb6fa31f36310afda9624daa3cbd045c01d777