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

Change-Id: Id798fe06c18348b17befbca944afa25f7c514a80