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

Change-Id: I57700be5f85047d439be3adbb492b0047a8c08af