am eedb5168: Merge changes I70e70894,I3adcb8a1

* commit 'eedb5168c3682472ddcc7de8fa4f3caa1d4b088b':
  Work around relocated boot.oat corruption
  Remove double space in messages