Merge "PrimaryImei framework changes"