Merge "Remove unnecessarily @System/TestApi annotations"