tweaks and remove mms settings breakage

Change-Id: I59ce696c1115e2df574c5bc55e7990b252ae48e6