Merge "Make percent-encoding available to product and vendor am: 599311bc16 am: 2ed3bb2e56 am: 7831727237 am: 0a204f02fe am: 580be4b99a"