QS Tiles: Fix Build

Change-Id: Id5edbc528f68a24d717b1522014ee2cf92b2f4ac
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1