Merge "getConnectionInfo should take calling package name as argument" into oc-mr1-dev am: 54c6667b37
am: 5cadf4f31c

Change-Id: Idddb212de872da7a857de1a5a4392cd48b7df14d