Change-Id: I9f97b5c545639217155fb46dfd32af3b435f00a5 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>