This is expected to create more console output, which needs to be fixed
on a case-by-case base.

Change-Id: Ic83fb1d4c4392cfb421d9c2eba52b7bae705daae
Reviewed-by: hjk <qthjk@ovi.com>