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