moved common config

Change-Id: I0289c4aae39c3f3f1a04f5b21b4c9e685ab7e645