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