world phone suport

Change-Id: Ib08ea454db046aed641cc748cfb3733e9bc000ce
Add Mms to the right place
Merge remote-tracking branch 'upstream/kk4.4' into kk4.4