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

Change-Id: I28c4304b0579bc74b21ab2634e261410b98d85b1