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