[automerger skipped] Merge "DO NOT MERGE fix some linkproperties configs missing" into pi-dev
am: 688dc83a8e  -s ours

Change-Id: I6e34e781d1289e06c148fb2537e5608f3f007971