Removes extra initialization from config

Change-Id: I4105619166cce524b454c55bba1c5a1ca8112f54
Closes-Bug: #1288864
Merge "Removes extra initialization from config"