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

Change-Id: I08350b698143a6bf6cf5d86bec2fc6489505b6f0