Merge "Fixing incorrect method to launch mobile data plan app." into pi-dev