[automerger skipped] Merge "DO NOT MERGE fix some linkproperties configs missing" into pi-dev am: 688dc83a8e -s ours
am: 2be392783e -s ours
Change-Id: I603a39040319b1008c4bf46927768c6888816a2a
This commit is contained in:
am: 2be392783e -s ours
Change-Id: I603a39040319b1008c4bf46927768c6888816a2a