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

Change-Id: I57fef9868fcd36f0ca517e48dfe8d4d13b4164b2