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

Change-Id: I8d0a6b7edb32c8a300bce902df909395f61f4373