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