Update MobileFrontend with cherrypick

Change-Id: I189c65f5328d094f5948affaaaafba0976805707