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