Change-Id: I122bc317a32f938c57f79e93f65170de26f13202 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>