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

Change-Id: I0ebf454140884fdde5c7f08c7e74c1b6770a7de0