Merge "Mark Dvr class @SystemApi"