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