Restoring config.cfg

Change-Id: I8ec24ca0276ee801e1a3880e6274231a79a16d82
Merge "Restoring config.cfg" into R1.10