Merge "Fix NoSuchMethodError for unit tests"