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

Change-Id: Ia544030482f2f694bd009e2e5b39d599dd20b92e