Configuration updates:Making a clear distinction between Init and Change Change-Id: I7b2fb326e1aabc08b032177a7b914a5b8bb7376f