Merge "Ensure handleUpdateLinkProperties runs on the CS handler thread." am: a8820983b3 am: b0cda1581d
am: f6b57d34ae

Change-Id: I507dfcdef170cfb02084899891308b078a6700de