Move more message boxes out of FDO

Change-Id: I9ed150d011aa4a78d8ab7f07ccce0e977d4b635b