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