Correct some issues with L3 extension

Change-Id: Id3e941e3416c80e8150c341e69c2ef29282139a0
author: diane fleming
Merge "Correct some issues with L3 extension"