am 47963424: Merge "Remove Manage Mobile Plan when config_show_mobile_plan is...
am 47963424: Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev
* commit '47963424':
Remove Manage Mobile Plan when config_show_mobile_plan is set to false