Merge "Set transport types to resolver" into rvc-dev am: 01cc8a33 am: 6744129a am: e5de0ec7 am: 6ebc6bae Change-Id: I5d7f851d4e2be6a4f6df4a09a5549cdb12de43bd