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