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

Change-Id: I14555061639da3b04b4bca74c692ac94e5713c74