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

Change-Id: I40834aa2e48af7bda5eeb19fbcd6b22c247352c3