Merge "Add missing modules to VTS" into oc-dev am: c9126b580e am: d13e45c888 am: 619418b87d am: 679ba4796a am: 66c255d11e am: 31d73a744f
am: 0222b784e7

Change-Id: Ib11ce3a7e7f9c0191a014e5027cc7b1d9f4c6c71