Merge "Frameworks: Mark tests" am: 997937820d am: 043d868185
am: 6ae05e38bd

Change-Id: I55b62b64236937c66a21ec667216f7f1d505a5b5
tree: 7d2c70c5e96ec19bcfb90b4ecd8a93c84713c950
  1. core/
  2. services/
  3. tests/