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

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

Change-Id: I472ccb6aba74e5cda1ffe67748ce047545e5fd9f