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

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