Merge "Add "millis" to API names."