Merge changes from topic "update-ims-hold-logic" am: 0022e1d3ca am: 1cca419368
am: 668ef7fc1d

Change-Id: I7cc66f699406be46c82e4acdaafa6fef8406fa9b