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