Change-Id: I7776b9035a2decc5e840e0d534d05b42c821e9f9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>