Merge "otafault: Add the missing #include <string>." am: 489155c44b
am: 9e232f9f2a

Change-Id: I94a7fe22907dc59b653ca2f0cc01b9deef2fc8e4