Merge "Fix QS CTS failure caused by tile backup" into nyc-dr1-dev am: 59b5c1030c
am: d4925d59cf

Change-Id: Iac2fe1713c79f5cd1002b5cf47b39f140c9d25fd