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