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