Merge "TestConnectionService needs more permissions!" into lmp-mr1-dev