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

Change-Id: I632f2774df0d889467e24a84b96124ea4ba3cd38