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