Merge "Clear spatial specific config struct at the beginning of parse routines" am: 0142f38904
am: 0ef6247c4f

Change-Id: I4e11c35bb3e4c20f2844bcec8912f15139fa185f