Merge "Temporarily disable LOS on 64 bit" into lmp-dev