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

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

Change-Id: I7cc42b3cf46b24f78ed1f16aa57d39fbee8bd505