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

Change-Id: Ib0651eb71af4d515ff40d4029cabea136cb8c302