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