Fix QS CTS failure caused by tile backup am: 34f6cbc288 am: 89fb99c8e9 am: 0318c9a681
am: 10bd4997bc

Change-Id: Ia150821cf25bdf4494a3202c7632557a9858284d