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

Change-Id: I46e448611a23a9e75f05b0ab48d4af47175de6d4