Merge "Allocate and de-allocate objects upon multi_config_change."
am: 2ac07839d1

Change-Id: Ibe8ebc2a66432766f56fd208a949ebbf2680abb7