Merge proposals dependent on lp://qastaging/~guijemont/moovida/video_parser_refactoring

lp://qastaging/~guijemont/moovida/video_parser_refactoring has no merge proposals.