Backport lbaas changes from R1.10

Change-Id: I8444f04bec89be668ec05e18f95dad00b53e4c78