Merge "Remove undefined PRIVATE_* variable"