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

Change-Id: I6dd534a93db0423b5bc8b3e5f7db5c2850e3a2d2