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

Change-Id: I426fbb3a8d2fb5d1f82e5bccb188b1e0abccdcf7