Merge "frameworks-test: adding missing @SmallTest"