Merge "Frameworks: Mark tests" am: c86b195cd5
am: 2b12970061

Change-Id: I73c717b99b9660a11141b5392c6993ab9aabf85c