Merge "Remove vendor_availble of propertyinfoserializer"
am: f08e28e440

Change-Id: Idad626b746e509cffad76431644a7388a8022fa5