Merge "Remove VTS_ROOT_PATH." am: 3a453efbae am: 34be18f87e
am: fa43640aa2

Change-Id: I0952092d0b2a74756c448d7e8eecfdff9b1199ff