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