Merge "Fix RoutingSessionInfo route ID issue" into rvc-dev am: 2dd6d27d4a am: b68e02446c am: 1604c7ec70

Change-Id: Ib4b6d235ac6cfbe41bf80e4bdb317a2c1c23f604