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

Change-Id: Ic9a0662a80b4a82a10aeb293136ebbd25e31c98a