Merge "Add property to prevent commit for Vts test"
am: 5bcfb5bf45

Change-Id: Ic6b0e863fb9c6ddea2cb19390a9520c3c87cf704