Bug:#1359633. LB changes for mainline

Change-Id: I4560377fe05aab8c02b006322b696d116b37624c
Merge "Bug:#1359633. LB changes for mainline"