Merge "Add fallback case to layers_extensions.cpp"
am: 46e75a69e8

Change-Id: I64ab2e76d6555131d7e1a6b6d2b2b92b040d9405