Merge "Make syn-mid available to product and vendor am: 91946bec9a am: c6d5e8bd97 am: e960ab6198 am: 7f45468278 am: 2318b3fcd7"