[automerger skipped] Merge "Allocate and de-allocate objects upon multi_config_change." am: 2ac07839d1 am: 5d0ee5e767
am: c36e385454 -s ours
am skip reason: change_id Ie58e842d1dc26e49528760e4ff3a6e50e3f8e7da with SHA1 5acb9cf878 is in history

Change-Id: Ie734dc1cfb44f47bc09e97948dc103aa8bc588fb