Merge "Add functional folder for vts 1.4." am: 8327a56b3d
am: 3b3220acc6

Change-Id: I4dd112df6cc713a0ae136337c98f72f0117d7f63