[automerger skipped] Merge "Make IMS configs non-translatable" am: 1e26fa48b4 am: ed7f3ae6b6 am: c508491fc2 -s ours
am skip reason: Change-Id Iffd4b2508fb5d46a53d650797eb2854f2479a64c with SHA-1 f255fc1dce is in history

Change-Id: I395e5d0591a14b08b05eba138625071ef0d9930a