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

Change-Id: I44e0967cf85bd4eced0187e972ad5ecd332b96ea