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

Change-Id: Icc9a5e45a7157ea4a89dfab12273900acfaacb93