Merge " * Move connectivity manager test closer to source.  * Add license header to java files  * Remove google related information from the test"