Merge "[automerger skipped] Merge "Add fallback case to layers_extensions.cpp" am: 46e75a69 am: eac760d2 am: a29e519d -s ours"