Merge "Update the base autogenerated config template for instru" into pi-dev
am: 3bd78ec87e  -s ours

Change-Id: Ia233cc92a15f329bd376b1a0560f1e6b6e6bc61b