am: e370b538 * commit 'e370b538': Add null pointer check in removeConnection Change-Id: I7b615a8f7c7a89617c4f748ad74007ec73db6784