Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 8f2f311757

Change-Id: I6524a91c109880dcace039d82f91cdf1f06ce6ac