Merge \"Merge \\\"QS Tiles: Fix some problems with connecting through...
Merge \"Merge \\\"QS Tiles: Fix some problems with connecting through intent\\\" into nyc-dev am: 12608853 am: d8aa42f3\" into nyc-mr1-dev-plus-aosp
am: 78bcbc92
Change-Id: Ie01c4be422887736b709912cffc1e5f2c8d3ba24