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