Merge "Make AudioState modes static constants" into lmp-dev