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

Change-Id: I515842522195d9b57a89532615157343d462cf78