Merge "API Review] Removed unnecessary SystemApi annotations" into tm-dev