[automerger skipped] Merge Coral/Flame into AOSP master
am: 3d53a8b7e1 -s ours
am skip reason: change_id If84dc1ab35432dadbb104387b206f3973cafa347 with SHA1 ac66f53d23 is in history

Change-Id: I6545e6ea301a7483de718f31b7d39c938a8e0c91