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

Change-Id: I1bf16d3c9375aded58c949886ae7a49213b49c91