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