Update MobileFrontend with backport for SWAT deploy

Change-Id: I25adb93020a131e6cbdbd06ebbac3632dabfaf0c