[automerger skipped] Merge Coral/Flame into AOSP master
am: 0ed99eca92 -s ours
am skip reason: change_id Ife2ba92f4c3c2bad08db288db184ba25bf52e4ad with SHA1 1fd1efbd2e is in history

Change-Id: I48408dc078cd0c7e0cd2451a9a3739bcbe9db0f2