Change-Id: I775ddc04e50b10d35993d1390bf8bd8e35f1dbbf
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>