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