Merge "Add suite component to test modules" am: 20bc9eb60b
am: 9db200e4dc

Change-Id: Ib1d2e7e2f278d2ef3be2ae5368ca2db64790c3da