Merge "Store config file with gid1" into pi-dev
am: 9e60b3ba49

Change-Id: I961ff4698af3bd2ac32bd474ecb48b68d4bdd7ad