Merge "Modify system properties proto"