[SYNC] Synchronize with compat

- fix message
- remove obsolete dateformat string

Change-Id: I820462b3b2ddbbe974b295f0675b66ccf24d1d49
Merge "[SYNC] Synchronize with compat"