Merge "Fix ErrorProne finding in WmTests" into tm-qpr-dev