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

Change-Id: Iaa07f7b05044a11eda31b22efc785509d997b31a