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