Merge "Cleanup based on comments." into graphics-dev