Merge \\\"QS Tiles: Fix some problems with connecting through intent\\\" into nyc-dev am: 126088536d am: a5076ef7fa
am: 8f21a99bfa

Change-Id: Idd0944573e8db2b282795952ceb35d2fe9961419