Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb