Merge changes from topic "update-ims-hold-logic"
am: 0022e1d3ca

Change-Id: I993d7d7dd8dde1ca517e1f578786f99af3f87c45