Update MobileFrontend for cherry-picks

Change-Id: Ic82ba72b987b3060e5fdabfc3bad248312c4c037