Merge "Add tests for b/34598346"