Merge "Add fallback case to layers_extensions.cpp" am: c3260262ae
am: a78bdeb228

Change-Id: I5565286bb7de790aa595e007ef186d81ddfe7ea3