Merge "Store config file with gid1"
am: e4dfd0c327

Change-Id: I5f17b5089f606122cf920311b22d65e129617094