Cherry-pick I550eb4b0a8fa18344e8b0de3ec85d61c2122ffb8

Fixes a MobileFrontend fatal

Change-Id: Ic853ebff4454692179bfdedce5ed031c79e8a967