Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: e00e30c98e
am: 3ba07129c8

Change-Id: I1d147330c78148de3c08591a2df042c7e499c751