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

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

Change-Id: If35eea6319fd0294cbd061369d56cc8c9c6d509d