Change-Id: Iee0a01491075e1e82c17211b5e119bd5e167763b Reviewed-by: Marco Bubke <marco.bubke@nokia.com>