[automerger skipped] Merge "Add property to prevent commit for Vts test" am: 5bcfb5bf45 am: 3507d68556 -s ours
am: d5fe5cfcb5 -s ours
am skip reason: change_id I20441964dbc7b6ad5b445fa17a1374c1282bbbd8 with SHA1 3f1ce062d5 is in history

Change-Id: Iab7f9bf4e3d7968384b2a35ae398e60e84bf0664