Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: a794775592 am: 7cac01b60c
am: 756329a304

Change-Id: Ie312450a5c9d0198a1107db59f280298a7ef4cf2