Fix bugs in configs

Change-Id: I49d77dc22f667560db7c06d98818104613d4aeb7
Merge "Fix bugs in configs"