Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 4d269c7593 am: 1c98bd15ca am: 590203cf6b
am: c0008f08e2

Change-Id: If3a3700f85549bcfcb4f52b75003a3c0916ed2f6