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