Merge "Remove vberCn, lberCn, xerCn" am: a9e6f70d50

Change-Id: I38a92582aa4aa4c0fc828548230e0cb98069907f