Merge "Expose connection update callback (4/4)" am: 60865e4a8d
am: 45487910b4

Change-Id: I43cca913c52aac4bd3487f7450ef8167c19db0df