[automerger skipped] Merge "Store config file with gid1" am: e4dfd0c327 am: 4026e0806b  -s ours
am: d22e683896  -s ours

Change-Id: I84c10d2bee8783edee1f5eac3d5c6388fcddf9bd