Merge "MediaUtils: Fix device unit tests"