Change-Id: I11397ac0e95ef8d754464dfb781667d247d9a83a Reviewed-by: Daniel Teske <daniel.teske@nokia.com>