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