Merge "Make MNC length hidden public" into rvc-dev