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

Change-Id: I14555061639da3b04b4bca74c692ac94e5713c74
tree: bf97546f94247b0873c055f93acd60f172023258
  1. core/
  2. services/
  3. tests/