Merge "Make ash available to product and vendor am: e19774600c am: bb64baccd7 am: 135c3df2b1 am: 916ab75aaa am: a791756682"