Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 22828a210c
am: 696c290c39

Change-Id: I8b53e1f74f960ead6a0eb848025b801d8b7fb637