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

Change-Id: Id7a0b7390a878b507e431be007ba2f2ce4f55e15