Merge "Remove vendor_availble of propertyinfoserializer" am: f08e28e440
am: 2f32fb43cf

Change-Id: Ic6d22f10c7e930c25133be0a83214a0590bd6769