Merge "Add new method to update Layer2 information when L2 roaming happens." am: b844596d02 am: b652d668bc

Change-Id: I85eabccb6f5d5f322c8e3df556ceef6647616f5a