Merge "QS Edit: clean up tile adapter" into nyc-dev am: cbcefaf85c
am: aecf9510b3

* commit 'aecf9510b321f564d2a063ff06d7d83be17a6188':
  QS Edit: clean up tile adapter

Change-Id: I2e993e647f981b11044bb8deeae8d75cc3f4d187