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