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