am 2424c93d: Merge "Fix for bug 5309242 [Prime] VideoEditorAPITest testVideoContentHD failed"

* commit '2424c93d84cd4cd0936cd7a5d1d7323ce5dc4e96':
  Fix for bug 5309242 [Prime] VideoEditorAPITest testVideoContentHD failed