Merge "Merge \\"QS: Hacks to fix bigger problems in TileService binding\\" into nyc-dev am: 1427bb3dc0 am: 9981d94d54" into nyc-mr1-dev-plus-aosp