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