Merge "Fix locatime.c indentation after sync"