am 6d2dd6a7: Merge "Fix 2nd arch prefix application"

* commit '6d2dd6a74035a7ace838dd44e7910d54e15c11c2':
  Fix 2nd arch prefix application