Merge "Make IMS configs non-translatable" am: 1e26fa48b4 am: ed7f3ae6b6

Change-Id: I382aa83eed46c46757d956cdcc0d9a7a9e372bbd