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

Change-Id: I8c639ddce8408d302f0aede2490d226ca9c4bd8c