Merge "Remove vberCn, lberCn, xerCn from system API"