Change-Id: I643d571afbb7b16f860092c885e3574268f91ddf Reviewed-by: Eike Ziller <eike.ziller@nokia.com>