Merge "Change flags to use int instead of long." into lmp-preview-dev