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

Change-Id: I56694ce7db607216328d7af55f3320e486eab797