Bug 39307 > remote control -- fixing samples