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

Change-Id: Ibba1a218d53312a69b0e336c5c740f5068743441