Merge "[automerger skipped] Merge "Create new API for MNO carrier id" am: 7e74c4e431 am: 2c8b12a1da am: 87d67c4f19  -s ours"