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

Change-Id: I34e501c7c9839020e53047fec7470c8aec9c7e44