Merge "Make constants static import"