am d73ec26a: Merge "Make default 64-bit primary, 32-bit secondary"

* commit 'd73ec26a19e82cefca45e3c80b37b015d423bda7':
  Make default 64-bit primary, 32-bit secondary