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

Change-Id: I17f553bded1573f2e19a7096f18364ce638702d0