Merge "Remove sysprop based radio reset sync mechanism"