Merge "Revert^2 "Add systrace tag for system property""