Merge "Frameworks: Mark tests"
am: c86b195cd5

Change-Id: I07af71812c623a14bd8df098e9991a331bdecbc2