Merge "lshal: SerializeFlag => SerializeFlags"