Merge "Backup system QS tiles" into nyc-dr1-dev
am: f498d0d384

Change-Id: I3df026ae22d4579c40e2c6532311ad69a3ceb0b7