Merge "Instead of returning an error, return an invalid duration (-1 ms)" into jb-mr2-dev