Merge "Revert "Cellinfo: Update to version 12"" into mm-wireless-dev