Merge "Bug 5045498 Implementation of RemoteControlClient.MetadataEditor"