Fix for Bug: 1360136: Corrected the way the data is retrieved for L2 routes

Change-Id: Icdefb2a1c557f324c2dda3868779ac6c04db7f43
Merge "Fix for Bug: 1360136: Corrected the way the data is retrieved for L2 routes" into R1.10