Merge "Add vendor properties blacklist"
am: 2e2290cf1a

Change-Id: I272d57b1b7729304a382c0d190e10da7180ca0ac