Merge "Add systrace tag for system property"