Merge "Preparing to finalize @SystemApi"