Merge "Fix MMS Config issues in Debug menu" am: 0e3986db52 am: eb4206aea1
am: f9b474c443

Change-Id: Ieb39c568893cde8c8b1fb880368a13967aff1c8d