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

Change-Id: I3a9a4bdd96ee39d7e7ae4179eef8d8cc683f38d3