Use actual storage type for format message strings

Change-Id: I214120303bf6c12c297332fa314ce80bc686da46
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0