Merge "LinkProperties: fix some indentation issues" am: a162726df7 am: e3b6b636cf
am: a63788076a

Change-Id: Ife901fd1c9c30b3864ddce61326f2d5caacd0bae