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

Change-Id: I740293ffde6b30f64dcae6dbb5ed145c05620177