Merge "Add null pointer check in removeConnection am: e370b538eb am: 58642e6545 am: 7e745ec49c am: dd0e3efd4d" into nyc-mr1-dev-plus-aosp
am: e01e336efc

* commit 'e01e336efcd7d254e8441831981e9ecd20042e2a':

Change-Id: I22ae08c295df61bd29b0e43b8376a093dbf5b0b4