Revert "Update MobileFrontend for cherry-picks"

This reverts commit 5834e6beeeb0ed417a2a64a6f3cb7c52c2e9b429.

Change-Id: I5c5cc3e3c80188ee9203ee323065a2a80f8d7446