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

Change-Id: I220a113e300ab8d033e7905a297d60a66c8b7039