Update MobileFrontend for cherry-pick

Change-Id: Ibf072ab1f1320e5120eeb05f3f1105f6711fdc34