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

Change-Id: I09ea85c7e1d2723c995b7713ebe2c0cd512c5838