Update MobileFrontend for cherrypick

Change-Id: Id2ab42514d32a00578335a2f9cd66b58d622b30e