[automerger skipped] Merge Coral/Flame into AOSP master
am: 45bba81ccd -s ours
am skip reason: change_id If7001a39517d7c4b04092f1aba6718e8994099a3 with SHA1 064e86b8de is in history

Change-Id: Ie95bfbe3c6523d454e7e77caa21166f702241879