Update MobileFrontend for cherry-picks

Change-Id: Ic26f56c0d14b2cadf4f16fea7435ce7b4e4dfbb9