Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 9793e40113

Change-Id: I5e444adeea7d58439dec959bf000ab4a552b2d0c