am 3298611e: Merge "Temporarily disable LOS on 64 bit" into lmp-dev

* commit '3298611e205a299612f2e403bfaeb955ec0a2bdd':
  Temporarily disable LOS on 64 bit