Merge "DO NOT MERGE frameworks-test: adding missing @SmallTest am: 141923e5b6  -s ours"