Merge changes I70e70894,I3adcb8a1

* changes:
  Work around relocated boot.oat corruption
  Remove double space in messages