Merge "Review Changes for Media CP Redirection CL"