Cherrypicking change I8d750d4f82f from master for MobileFrontent

Change-Id: I4f6b88b022909065709d6a973d582c08fd497205