Merge "Make sure TileServices get onTileRemoved on reset" into oc-dev am: c463bed8db
am: 72626d2dc2

Change-Id: I53aee8573abab7d59db1eaaf9692e73a4374389d