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

Change-Id: Ia1404da7311b03a50a9033e6f046ad022527f4f8