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