[automerger skipped] Revert "Remove testVendorPropertyNamespace" am: c4d5953a0b am: bcd5c3fca1
am: 24a0300526 -s ours
am skip reason: change_id I82bc5d931197684be9f5ca623a55f42cbdc1fd84 with SHA1 496765e52a is in history

Change-Id: If0f111b8c9d1225dd2ce849401f936f716c68848