am 576bb4a6: Reconcile with ics-mr1-release

* commit '576bb4a63f925ef5862eedb6428ba890f0ad1054':
tree: e2ae11f95f4f4ac4aae1ee920af112f5a2fd565d
  1. libvideoeditor/