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

Change-Id: I014cb5b5567efea795f8716ff5c57df7708379b6