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