Merge "pre-provide the mvno data of the edited apn" into jb-mr2-dev