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

Change-Id: I877db4ede2362e12b93f8dd97b8c65c2d6fbb553