Merge "Small cleanup of am/pm commands."