am: dfc1ee0 * commit 'dfc1ee0162f6ee4b18c573f2d0d59001d0447f1a': Correct naming issues with video calling carrier config items.
am: dfc1ee0 * commit 'dfc1ee0162f6ee4b18c573f2d0d59001d0447f1a': Correct naming issues with video calling carrier config items.