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