Merge "liblog: Assure shifting behavior is consistent"