Cherrypicking change I8d750d4f82f from master for MobileFrontent

Change-Id: I436f9cebc6857a286cc7a58a6f7e7070621d2b7a