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

Change-Id: Ic0a97fe453a9ddc6262e4900574b945807a051c1