Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 0e618b2c64 am: 549fe98ac8
am: 78831d900d

Change-Id: I0a0ed7cf6e4c5daa9141e1e6f25da98dd8239a73