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

Change-Id: I32f369716979e1e6c3df6abeb12fbecc1ad4185e