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

Change-Id: I25f1207166aafe831b74e865d92dcc0437d330e3