Merge "No longer set CONFERENCE_HAS_NO_CHILDREN on SRVCC" am: 92cad26e83 am: 10504fb108
am: 1bd119225c

Change-Id: I625e108cdd77465962996c634aceb065930c38c5