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

Change-Id: Ifdc6e3d9875d27fbbdca3bbd92bb1d40dbd89008