[SYNC] Sychronized config.py with core

Change-Id: Ibea6f4695bd118c778ec6a6b1193da528af7268f
Merge "[SYNC] Sychronized config.py with core"