Merge "Properly update profile connection state"
am: 0b4d65d712

Change-Id: I6560567be184ca4e03f6f8e0ec166ca57ae45a96