[automerger skipped] Merge Coral/Flame into AOSP master
am: 68c8851687 -s ours
am skip reason: change_id I8fce5a4b988354cd3275a58a19a6244fa9bf639c with SHA1 e9b70bfbf2 is in history

Change-Id: I323acea4170cb164cc8ad9eb116a2a8a17d55f73