Merge "Fix LCN API inconsistency with code"