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

Change-Id: Ia4522f456c0d68cf787e889d391a12b64f6cb146