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

Change-Id: I0902027750cc797c950ed375832dcc379bbdb93b